From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 4 Jul 2013 00:57:32 +0000 (+0200)
Subject: checkBox: Remove height-for-width hack
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3679
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c5dfc432d90c88a3d67e3e702a497329203d0baa;p=gnome-shell.git

checkBox: Remove height-for-width hack

With the move to ClutterBoxLayout, height-for-width should now
work properly, so remove this old hack.

https://bugzilla.gnome.org/show_bug.cgi?id=703811
---

diff --git a/js/ui/checkBox.js b/js/ui/checkBox.js
index 06b4367ee..097fe96f6 100644
--- a/js/ui/checkBox.js
+++ b/js/ui/checkBox.js
@@ -42,12 +42,6 @@ const CheckBoxContainer = new Lang.Class({
     },
 
     _getPreferredHeight: function(actor, forWidth, alloc) {
-        /* FIXME: StBoxlayout currently does not handle
-           height-for-width children correctly, so hard-code
-           two lines for the label until that problem is fixed.
-
-           https://bugzilla.gnome.org/show_bug.cgi?id=672543 */
-/*
         let [minBoxHeight, natBoxHeight] =
             this._box.get_preferred_height(forWidth);
         let [minLabelHeight, natLabelHeight] =
@@ -55,14 +49,6 @@ const CheckBoxContainer = new Lang.Class({
 
         alloc.min_size = Math.max(minBoxHeight, minLabelHeight);
         alloc.natural_size = Math.max(natBoxHeight, natLabelHeight);
-*/
-        let [minBoxHeight, natBoxHeight] =
-            this._box.get_preferred_height(-1);
-        let [minLabelHeight, natLabelHeight] =
-            this.label.get_preferred_height(-1);
-
-        alloc.min_size = Math.max(minBoxHeight, 2 * minLabelHeight);
-        alloc.natural_size = Math.max(natBoxHeight, 2 * natLabelHeight);
     },
 
     _allocate: function(actor, box, flags) {